72. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Dec 13 16:40:55 2019 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

72.1 Files compared

# Location File Last Modified
1 Porto v.3.2.1\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\page\html sticky_header.phtml Fri Nov 1 15:59:48 2019 UTC
2 Porto v.3.2.2\Theme Files\Magento 1.x\Porto Theme\app\design\frontend\smartwave\porto\template\page\html sticky_header.phtml Wed Nov 27 12:06:14 2019 UTC

72.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 116
Changed 0 0
Inserted 2 2
Removed 0 0

72.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

72.4 Active regular expressions

No regular expressions were active.

72.5 Comparison detail

1   <?php   1   <?php
2       $store  = Mage::a pp()->getS tore();   2       $store  = Mage::a pp()->getS tore();
3       $code   = $store- >getCode() ;   3       $code   = $store- >getCode() ;
4   ?>   4   ?>
5   <script ty pe="text/j avascript" >   5   <script ty pe="text/j avascript" >
6           jQ uery(funct ion($){   6           jQ uery(funct ion($){
7                    var  scrolled =  false;   7                    var  scrolled =  false;
8                    $(wi ndow).scro ll(functio n(){   8                    $(wi ndow).scro ll(functio n(){
9                                 if (140<$(win dow).scrol lTop() &&  !scrolled) {   9                                 if (140<$(win dow).scrol lTop() &&  !scrolled) {
10                         if(!$('.he ader-conta iner .menu -wrapper . mini-cart' ).length & & !$('.hea der-contai ner .menu- wrapper .s ticky-logo ').length) {   10                         if(!$('.he ader-conta iner .menu -wrapper . mini-cart' ).length & & !$('.hea der-contai ner .menu- wrapper .s ticky-logo ').length) {
11                                          $('. header-con tainer').a ddClass("s ticky-head er");   11                                          $('. header-con tainer').a ddClass("s ticky-head er");
        12                                          if(! $('.header -container ').hasClas s('type24' ) && !$('. header-con tainer').h asClass('t ype27')) {
12                                          var  minicart =  $('.heade r-containe r .mini-ca rt').html( );   13                                                   var mi nicart = $ ('.header- container  .mini-cart ').html();
13                                          $('. header-con tainer .me nu-wrapper ').append( '<div clas s="mini-ca rt">'+mini cart+'</di v>');   14                                                   $('.he ader-conta iner .menu -wrapper') .append('< div class= "mini-cart ">'+minica rt+'</div> ');
14                    <?ph p if(Mage: :getStoreC onfig('por to_setting s/header/s ticky_head er_logo',  $code)): ? >   15                             <?php  if(Mage::g etStoreCon fig('porto _settings/ header/sti cky_header _logo', $c ode)): ?>
15                         var logo_i mage = $(' <div>').ap pend($('.h eader-cont ainer .hea der > .log o').clone( )).html();   16                                 va r logo_ima ge = $('<d iv>').appe nd($('.hea der-contai ner .heade r > .logo' ).clone()) .html();
16                         $('.header -container  .menu-wra pper').pre pend('<div  class="st icky-logo" >'+logo_im age+'</div >');   17                                 $( '.header-c ontainer . menu-wrapp er').prepe nd('<div c lass="stic ky-logo">' +logo_imag e+'</div>' );
17                         <?php if(M age::getSt oreConfig( 'porto_set tings/head er/sticky_ header_log o_img', $c ode)):?>   18                                 <? php if(Mag e::getStor eConfig('p orto_setti ngs/header /sticky_he ader_logo_ img', $cod e)):?>
18                         $(".sticky -logo img" ).attr("sr c","<?php  echo $this ->getSkinU rl(Mage::g etStoreCon fig('porto _settings/ header/sti cky_header _logo_img' , $code));  ?>");   19                                 $( ".sticky-l ogo img"). attr("src" ,"<?php ec ho $this-> getSkinUrl (Mage::get StoreConfi g('porto_s ettings/he ader/stick y_header_l ogo_img',  $code)); ? >");
19                         $('.header -container .type15.st icky-heade r .header  > .logo im g').addCla ss("hide") ;   20                                 $( '.header-c ontainer.t ype15.stic ky-header  .header >  .logo img' ).addClass ("hide");
20                         $('.header -container .type15.st icky-heade r .header  > .logo im g.sticky-l ogo-image' ).remove() ;   21                                 $( '.header-c ontainer.t ype15.stic ky-header  .header >  .logo img. sticky-log o-image'). remove();
21                         $('.header -container .type15.st icky-heade r .header  > .logo'). append('<i mg src="<? php echo $ this->getS kinUrl(Mag e::getStor eConfig('p orto_setti ngs/header /sticky_he ader_logo_ img', $cod e)); ?>" c lass="stic ky-logo-im age" alt=" Sticky Log o"/>');   22                                 $( '.header-c ontainer.t ype15.stic ky-header  .header >  .logo').ap pend('<img  src="<?ph p echo $th is->getSki nUrl(Mage: :getStoreC onfig('por to_setting s/header/s ticky_head er_logo_im g', $code) ); ?>" cla ss="sticky -logo-imag e" alt="St icky Logo" />');
22                         <?php endi f; ?>   23                                 <? php endif;  ?>
23                    <?ph p endif; ? >   24                             <?php  endif; ?>
        25                             }
24                                          $('. header-con tainer .he ader-wrapp er > div') .each(func tion(){   26                                          $('. header-con tainer .he ader-wrapp er > div') .each(func tion(){
25                                                   if($(t his).hasCl ass("conta iner")){   27                                                   if($(t his).hasCl ass("conta iner")){
26                                                            $(this). addClass(" already");   28                                                            $(this). addClass(" already");
27                                                   } else  {   29                                                   } else  {
28                                                            $(this). addClass(" container" );   30                                                            $(this). addClass(" container" );
29                                                   }   31                                                   }
30                                          });   32                                          });
31                                          scro lled = tru e;   33                                          scro lled = tru e;
32                         }   34                         }
33                         if($('.hea der-contai ner').hasC lass("type 3")) {   35                         if($('.hea der-contai ner').hasC lass("type 3")) {
34                             var wi shlist_lin k = $('.he ader-conta iner > .he ader.conta iner .wish list-link' ).html();   36                             var wi shlist_lin k = $('.he ader-conta iner > .he ader.conta iner .wish list-link' ).html();
35                                               $('.header -container  .menu-wra pper').app end('<div  class="wis hlist-link ">'+wishli st_link+'< /div>');   37                                               $('.header -container  .menu-wra pper').app end('<div  class="wis hlist-link ">'+wishli st_link+'< /div>');
36                         }   38                         }
37                                 }   39                                 }
38                                 if (140>=$(wi ndow).scro llTop() &&  scrolled) {   40                                 if (140>=$(wi ndow).scro llTop() &&  scrolled) {
39                                          $('. header-con tainer').r emoveClass ("sticky-h eader");   41                                          $('. header-con tainer').r emoveClass ("sticky-h eader");
40                                          $('. header-con tainer .me nu-wrapper  .mini-car t').remove ();   42                                          $('. header-con tainer .me nu-wrapper  .mini-car t').remove ();
41                                          $('. header-con tainer .me nu-wrapper  .wishlist -link').re move();   43                                          $('. header-con tainer .me nu-wrapper  .wishlist -link').re move();
42                    <?ph p if(Mage: :getStoreC onfig('por to_setting s/header/s ticky_head er_logo',  $code)): ? >   44                    <?ph p if(Mage: :getStoreC onfig('por to_setting s/header/s ticky_head er_logo',  $code)): ? >
43                         $('.header -container  .menu-wra pper > .st icky-logo' ).remove() ;   45                         $('.header -container  .menu-wra pper > .st icky-logo' ).remove() ;
44                         $('.header -container .type15 .h eader > .l ogo img.st icky-logo- image').re move();   46                         $('.header -container .type15 .h eader > .l ogo img.st icky-logo- image').re move();
45                         $('.header -container .type15 .h eader > .l ogo img'). removeClas s("hide");   47                         $('.header -container .type15 .h eader > .l ogo img'). removeClas s("hide");
46                    <?ph p endif; ? >   48                    <?ph p endif; ? >
47                                          scro lled = fal se;   49                                          scro lled = fal se;
48                                          $('. header-con tainer .he ader-wrapp er > div') .each(func tion(){   50                                          $('. header-con tainer .he ader-wrapp er > div') .each(func tion(){
49                                                   if($(t his).hasCl ass("alrea dy")){   51                                                   if($(t his).hasCl ass("alrea dy")){
50                                                            $(this). removeClas s("already ");   52                                                            $(this). removeClas s("already ");
51                                                   } else  {   53                                                   } else  {
52                                                            $(this). removeClas s("contain er");   54                                                            $(this). removeClas s("contain er");
53                                                   }   55                                                   }
54                                          });   56                                          });
55                                 }   57                                 }
56                    });   58                    });
57           }) ;   59           }) ;
58   </script>   60   </script>